Use PAGE_OFFSET instead of __PAGE_OFFSET in netfront.c.
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Thu, 6 Apr 2006 08:32:55 +0000 (09:32 +0100)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Thu, 6 Apr 2006 08:32:55 +0000 (09:32 +0100)
__PAGE_OFFSET is not defined on all platforms.
Linux/ia64 and Linux/ppc don't have __PAGE_OFFSET definition.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c

index b85ff4b1d3c8da47c96a2d65fea698a7c3f52a1a..1336be5432c86a248b1db38004af432ee5840fe9 100644 (file)
@@ -993,8 +993,8 @@ static void network_connect(struct net_device *dev)
         * the RX ring because some of our pages are currently flipped out
         * so we can't just free the RX skbs.
         * NB2. Freelist index entries are always going to be less than
-        *  __PAGE_OFFSET, whereas pointers to skbs will always be equal or
-        * greater than __PAGE_OFFSET: we use this property to distinguish
+        *  PAGE_OFFSET, whereas pointers to skbs will always be equal or
+        * greater than PAGE_OFFSET: we use this property to distinguish
         * them.
         */
 
@@ -1005,7 +1005,7 @@ static void network_connect(struct net_device *dev)
         * interface has been down.
         */
        for (requeue_idx = 0, i = 1; i <= NET_TX_RING_SIZE; i++) {
-               if ((unsigned long)np->tx_skbs[i] < __PAGE_OFFSET)
+               if ((unsigned long)np->tx_skbs[i] < PAGE_OFFSET)
                        continue;
 
                skb = np->tx_skbs[i];
@@ -1036,7 +1036,7 @@ static void network_connect(struct net_device *dev)
 
        /* Rebuild the RX buffer freelist and the RX ring itself. */
        for (requeue_idx = 0, i = 1; i <= NET_RX_RING_SIZE; i++) {
-               if ((unsigned long)np->rx_skbs[i] < __PAGE_OFFSET)
+               if ((unsigned long)np->rx_skbs[i] < PAGE_OFFSET)
                        continue;
                gnttab_grant_foreign_transfer_ref(
                        np->grant_rx_ref[i], np->xbdev->otherend_id,